From dff14d2746aeb12be2b6fbd6368bdb600dad7918 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Sun, 10 Sep 2006 14:26:27 -0600 Subject: [PATCH] [IA64] Cleanup for PV-on-HVM for IPF Signed-off-by: Tsunehisa Doi Signed-off-by: Tomonari Horikoshi --- linux-2.6-xen-sparse/include/asm-ia64/hypercall.h | 4 ++++ linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h | 14 +++++++++----- linux-2.6-xen-sparse/include/asm-ia64/maddr.h | 4 ++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h index 8270a96ce1..8375336941 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h @@ -205,8 +205,12 @@ ____HYPERVISOR_memory_op( } #include +#ifdef CONFIG_VMX_GUEST +# define ia64_xenmem_reservation_op(op, xmr) (0) +#else int ia64_xenmem_reservation_op(unsigned long op, struct xen_memory_reservation* reservation__); +#endif static inline int HYPERVISOR_memory_op( unsigned int cmd, void *arg) diff --git a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h index f6b750ceeb..7b1a9a7fc9 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h @@ -33,13 +33,17 @@ #ifndef __HYPERVISOR_H__ #define __HYPERVISOR_H__ -#if !defined(CONFIG_XEN) && !defined(CONFIG_VMX_GUEST) -#define is_running_on_xen() (0) -#define HYPERVISOR_ioremap(offset, size) (offset) -#else +#ifdef CONFIG_XEN extern int running_on_xen; #define is_running_on_xen() (running_on_xen) -#endif +#else /* CONFIG_XEN */ +# ifdef CONFIG_VMX_GUEST +# define is_running_on_xen() (1) +# else /* CONFIG_VMX_GUEST */ +# define is_running_on_xen() (0) +# define HYPERVISOR_ioremap(offset, size) (offset) +# endif /* CONFIG_VMX_GUEST */ +#endif /* CONFIG_XEN */ #if defined(CONFIG_XEN) || defined(CONFIG_VMX_GUEST) #include diff --git a/linux-2.6-xen-sparse/include/asm-ia64/maddr.h b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h index d80345b9b9..55c6f94d10 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/maddr.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h @@ -81,7 +81,11 @@ mfn_to_local_pfn(unsigned long mfn) #define virt_to_machine(virt) __pa(virt) // for tpmfront.c #define set_phys_to_machine(pfn, mfn) do { } while (0) +#ifdef CONFIG_VMX_GUEST +extern void xen_machphys_update(unsigned long mfn, unsigned long pfn); +#else /* CONFIG_VMX_GUEST */ #define xen_machphys_update(mfn, pfn) do { } while (0) +#endif /* CONFIG_VMX_GUEST */ typedef unsigned long maddr_t; // to compile netback, netfront -- 2.30.2